; Fix last change

* doc/misc/epa.texi (Cryptographic operations on regions): Fix
wording of the 'epa-keys-select-method's documentation.
* lisp/epa.el (epa-keys-select-method): Doc fix (bug#69133).

diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index cd6da1dadba975f55a20be6265e6c421daac07db..f450b9cbdd989bb8023036e95e58afac153bdd2e 100644 (file)
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -289,11 +289,13 @@ also ask you whether or not to sign the text before encryption and if
 you answered yes, it will let you select the signing keys.
 @end deffn
 
-You can change the default method that is used to select keys with the
-variable @code{epa-file-select-keys}.
-
 @defvar epa-keys-select-method
-Method used to select keys in @code{epa-select-keys}.
+This variable controls the method used for key selection in
+@code{epa-select-keys}.  The default value @code{buffer} pops up a
+special buffer where you can select the keys.  If the value is
+@code{minibuffer}, @code{epa-select-keys} will instead prompt for the
+keys in the minibuffer, where you should type the keys separated by
+commas.
 @end defvar
 
 @node Cryptographic operations on files

diff --git a/lisp/epa.el b/lisp/epa.el
index b2593bc62baa12d1a0dcf93f7ff97283a05ce89d..c29df18bb58bc2b661166755c886b675b29802e8 100644 (file)
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -77,7 +77,8 @@ The command `epa-mail-encrypt' uses this."
   "Method used to select keys in `epa-select-keys'.
 If the value is \\='buffer, the default, keys are selected via a
 pop-up buffer.  If the value is \\='minibuffer, keys are selected
-via the minibuffer instead, using `completing-read-multiple'."
+via the minibuffer instead, using `completing-read-multiple'.
+Any other value is treated as \\='buffer."
   :type '(choice (const :tag "Read keys from a pop-up buffer" buffer)
                 (const :tag "Read keys from minibuffer" minibuffer))
   :group 'epa